[automerger skipped] Merge "suspend: Change good suspend time to total" am: 22bbd096ca am: de8b38f0ec am: c90c02c687 -s ours am: 69f73c2732 -s ours am skip reason: Merged-In Ibb0daa62259a05bc21a4e69ef298c1e92d7fb970 with SHA-1 74fe319112 is already in history Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/1696310 Change-Id: Ia23cc8ba6d044ec355bac4f3afbfe38ce770225f